Auto merge of #1868 - alex:patch-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 3 Aug 2015 01:40:34 +0000 (01:40 +0000)
committerbors <bors@rust-lang.org>
Mon, 3 Aug 2015 01:40:34 +0000 (01:40 +0000)

Trivial merge